Merge "Mark updatable APEXes" am: ab8a7e35ec

Change-Id: Iaa4dba96e1ad565094c054d6d35b2e6b845d3c09