Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958
am: 5c091dc944

Change-Id: I582cc33d13d04950ca066074c292141605f3ca27