Merge "libnativeloader: remove stubs for now." am: 3ec4081849
am: 971ed59d99

Change-Id: I044d39da629386d3492f95aadc6836f2fce40e22