Merge "Nuke all reference to /etc/ethers"
am: 41a0b2e1a4

Change-Id: Iea050a0650a851c40b05dddda5322a6378c0b8c8