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

Change-Id: I071f430fa4ed033848353fdf59e972eb474be4a4