am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"

* commit 'e6246ca6cc48e182cc5e193510b05f8889ba9aed':
  fs_mgr: turn on -Werror