Re-align headers for AOSP building

Change-Id: I98bd35c4d05210165150d71d77cc94029ad2f449