Merge "Remove unnecessary dependency on libnativehelper.so"