Merge "Remove unused libnativehelper include"