config changes for aosp hammerhead builds

Change-Id: Ifd4f2de944dabdc271b08d1f0e8cbea18a4814ce
7 files changed