am d9f98c81: Fix build break due to merge.
am d9f98c81: Fix build break due to merge.

# Via Jean-Baptiste Queru
* commit 'd9f98c81068594c33c81b5b817391c6b4b895492':
  Fix build break due to merge.

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