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

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