Merge "Use hasmntopt(3) rather than reinventing the wheel." am: 769a5a1962
am: 8656ed109b

Change-Id: Ied4c404b0d0f957bfe0e9ff3841173b52147b21b