Merge "adbd: add apex_available and visibility for internal libs."