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

Change-Id: Iffc2d93a6bf6d60768a05cef4c7ba425e701414e