TheMuppets/proprietary_vendor_htc 1 merged

• hima-common: O-mr1 ril fixup Jan 7