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

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