Merge "Use -Werror in frameworks/av/services/minijail"
am: a09c0d25ea

Change-Id: Iaeae03e2a844b41fd636d2c7e95b93997c9a9528