Merge "Rename libnativebridge-dummy-headers to libnativebridge-headers" am: 5de97757f6
am: 36ef62f9fe

Change-Id: I08476821238035fa947ecdbc56c50921c57eca02