am ad5789c6: am c70e89e2: Fix hybrid build
am ad5789c6: am c70e89e2: Fix hybrid build

* commit 'ad5789c6dcad930f1fce34685b7ca84df4d68e90':
  Fix hybrid 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