Merge "Cleanup: remove VNDK APEX exception from binder"