Merge "Remove apex component from system.img whitelist"