Merge "Update to use nativehelper/JNIPlatformHelp.h"