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

Change-Id: Ie21c818aa27aadf92bf359fc3a8e02497b3a4b5b