Merge "Add some missing apexes to apex_available" am: 4a24272a84 am: b6ddfa83b4 am: 9e57782400 am: c05d2c481b am: 96a0976499

Change-Id: I1b1bac8de9f140387fd3d19bea4fddcea2afb860