am 3379c1cb: Fix broken build automerge: 2652c57
am 3379c1cb: Fix broken build
automerge: 2652c57

* commit '2652c57257416f088de3e5b359f36a63e3cbe91d':
  Fix broken 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