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

Change-Id: I4dc068de9f57117e636f123eac25496667057341