am a52b503b: Merge "Compatibility lib changes for IP2."
am a52b503b: Merge "Compatibility lib changes for IP2."

* commit 'a52b503b2e992973b81d87bed5353e7fd47d9528':
  Compatibility lib changes for IP2.

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