Revert "Merge https://github.com/BrokenOs/frameworks_base into lp"

This reverts commit 69ab1497ced29d00c26370478a76a42a77ad7682, reversing
changes made to a27544cc4313837ff7ccdc7f538578189cff8cff.