switch android_device_htc_m7 to its variants

try pull changes