resolved conflicts for merge of 1b53b6a7 to master
resolved conflicts for merge of 1b53b6a7 to master

Change-Id: Id08fb8de4f136596fd39b651446ec96fc952427a

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