Alignments for building on htc bravo

Change-Id: I646ea1fa6a111d912544f76ba754165937c84bbe