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

Change-Id: I098b877cbd6e30b901359e15c5fd2ba8b23e1f4b