Merge "Build native coverage variant of APEXes when needed" am: dcea882e am: e29e7a87 am: 3b0b0ce5 am: 9a504cdc Change-Id: I51f7359c399607949a36e176fb1ef4015c568aa1