4.8 patch

Port over some new and old aosp patches that we found missing