build system changes for jb-aah-dev merge

Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2 files changed