Merge "Remove aidl_interface visibility." am: 687d82a177 am: a645ce2ac5

Change-Id: I164b70c881e0ad93c4b463a1055a79e96626dcfe