Merge "Revert^2 "Enable APEX stubs for libnativeloader."" am: 03cb8010ef
am: 41c92187a5

Change-Id: If2a226a575fc68fad66909326afefa7a1dfe81dc