Merge "Remove apex component from system.img whitelist" am: e841b373b5 am: 14e8b39ad4 am: 9fad472413
am: f1a60aa323

Change-Id: Ia29ea5245ec1b624db932f3a9a8b0a806a90ff1d