Merge "Tracking libnativehelper dependencies"