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

Change-Id: I2404a616839124be332725e124f2390a85be5a54