HTC defconfigs: update
m7: fix build