am fed822cb: Merge "Fix Tethys asset" into klp-dev
am fed822cb: Merge "Fix Tethys asset" into klp-dev

* commit 'fed822cb8e17579dfa792b40ebe82683088e7779':
  Fix Tethys asset

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