nerge in newest aosp

This reverts commit c923610616eec7f7cc25e9cba903485c9a2a94fd.
Revert "merge in @olddroid's compiled aosp userdebug of 5.0.0_r2"

This reverts commit 35f224526750ed152ce658139620da89c9ccd594.
Hello, My name is frank
this is a whole bottom end replacement with the merges from the new aosp source with the n6 frameworks still on top