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

Change-Id: Iec3b4c60ee07b8208ae55badb5e0df268a4a7178