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