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

Change-Id: If2f24ff3a631a777cf9416166746d15d0a1379e2