Merge "introduce AUX build class of targets" am: 556526bf95
am: 755391d77e

Change-Id: Ib89db8465bd6e38ac3d0b7aa3a24e969e8a9c76c