Merge "libnativehelper: minor C++ modernization"