This reverts commit d961564048. Build broken in win_sdk aosp_x86_64 mac_sdk Change-Id: I6a2b3aa526e070a7f2e1bb314066bfb9624e8a17
d961564048