am 8d84b6f9: am ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."

* commit '8d84b6f9f576fe51b2cb4a54042bf95af923e55b':
  Kill INCLUDE_SYS_MOUNT_FOR_STATFS.