Some hw/qcom varients to AOSP

Change-Id: Ib5ee53abc0fd831d61f3e1d0a5bf98f82c42b2ea