am e1324cd4: am 17151e4d: Merge "run-as: turn on -Werror"

* commit 'e1324cd4d80c897442902f6358f78b761e42d5ff':
  run-as: turn on -Werror