am e944c06b: am 71d29ec9: am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev
am e944c06b: am 71d29ec9: am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev

* commit 'e944c06b351701b929146a7817055f91606d8b9f':
  Partial revert "Add better errors for unresolved attributes, remove unused code"

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