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

Change-Id: I1af8e30284200a77e3c79800d0dd2ddcae4543ab