Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" into oc-dev