Merge "Remove compile_multilib: first" am: 12c7c99159
am: 834a042ecb

Change-Id: I78494a39880cfe2a7dc427fd2abb43808aa1c52f