Merge "Revert "libbinder: remove __ANDROID_APEX__ stability diff"" into sc-dev