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

Change-Id: I8c58767a5ab07675af59898c0587737fdaa588b9