am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev
am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev

* commit '5caa24fd3eb12edbc75f35dba831166b8ebe603f':
  Temporarily disable FakeOemFeatures from userdebug or higher builds

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