Merge "Make the xtables lock readable only by AID_RADIO and root." am: 438720ac2c
am: 82cf4caaaa

Change-Id: Ieb05cd70f8b490460736ae7a348b26b255ac5633