am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev

* commit 'c2fb6e107d81e50a58fe25073f490b9dd48b31e2':
  Both ext4 and f2fs binaries for adoptable storage.