am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."

* commit 'a6eaa197f3f6d96696cddf5c2bf86ac628e461d8':
  Remove dead code that's keeping other dead code in frameworks/base alive.