am 3e572762: am 0646fdae: Fix SDK build.
am 3e572762: am 0646fdae: Fix SDK build.

* commit '3e5727623a19c1daed4be62cb2a31c7c29eb5ff6':
  Fix SDK build.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build