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

Change-Id: I39ce57d77b67135521c120aba6a585a24e50cf20