am d24a12a1: am 0d8019cf: Replace shadow workaround with a different one

* commit 'd24a12a197708f9aae844dea08af38d30a2c77c4':
  Replace shadow workaround with a different one
tree: 2bd9de4639849b983578140b4b793efb653c9340
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags