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

Change-Id: I1acbc1b1f8bfe0ccea1a15f91d98a5d7ba027f9c