Merge "Replace libnativeloader-dummy-headers with libnativeloader-headers" am: 08f53757a0
am: 3ff496a7bc

Change-Id: I09ff6d9e983619f14bd46d7a5c4ecd3a011f4223