am 3b3d2160: am 7547b8ea: fix build
am 3b3d2160: am 7547b8ea: fix build

Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'

* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
  fix build

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base