Use AOSP guts for more qcom stuff

Change-Id: I9f7898a694141b4226a74b6c626f15031563188e