Merge "dalvik: use proper nativehelper headers" am: dfdc080699
am: 7d323ac8b2

Change-Id: If9321e98a0fdbc9c62bcd558f436c88df874ae86