Merge "adbd: add apex_available and visibility for internal libs." am: 448519736b am: b802fd9b1c

Change-Id: I4f3ba750255be96a1f0a0b3a18d16b2266ccf9fa