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

Change-Id: I08fe92e0418a0f7b419d3ffee81e6fcdc1438033