Merge "Remove unused libnativehelper include."
am: 9c98845827

Change-Id: I7e979be93f245e9b2c62a1866b74127d7b43b448