Merge "frameworks/base: use proper nativehelper headers"