adhere to cm's qcom hal variants

Change-Id: I86ba3e5c4de93ff9e5ecd3d8c660563b069f65a1
Signed-off-by: cj360 <ayunker551@gmail.com>