Merge "Remove unused libnativeloader-dummy-headers" am: 1b31d85b07 am: 6dacf8beac
am: 8d1bee3824

Change-Id: Ice01cefe589293c96104771131b1205dd3b27b8d