resolve merge conflicts of b5775d97b4 to master.
resolve merge conflicts of b5775d97b4 to master.

Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6

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