Reverting

This reverts commit 5fef0cb0b4e4d01eda641a219f46556e4933e8e2.
Reverting aosp stuff because it breaks bluetooth and I can't play with it anymore tonight

This reverts commit a7e6c66e74f8f28708f78f28a41ead09b7e374fe.