Merge "libnativehelper: restrict libbase dependency" am: 1ee6a47a19 am: f36fa39201

Change-Id: Ica8bb36a8a0b4578d1800b4b61df4a1b4a0b78f6