Merge "Revert "Make the xtables lock readable only by AID_RADIO and root."" am: d272ca38f6 am: aaa2b30d5c am: 87f9ffdac7
am: 20d9068e00

Change-Id: I8713d673cf6fed24ce3ba4345b9562f4e7f2fb5c