Merge "Add some missing apexes to apex_available" am: 4a24272a84 am: b6ddfa83b4

Change-Id: Ibad4404ad6d94483b740f55bb43d10c2226a14c1