Reconcile the merge.
Reconcile the merge.

Change-Id: If3edaedc417e390005b83cbf649b5c1f07a2ea82

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