Merge "Revert^2 "Enable APEX stubs for libnativeloader.""