am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."

* commit '4f6c526e13eb00c94f8745fb9e52f10c3474a87f':
  Link libc++_static into fs_mgr.