Merge "Use -Werror in frameworks/av/services/mediaextractor" am: 5988a68bb3 am: 868705c87f
am: d9ad45b8a5

Change-Id: Ic6679ffafbad08d2b6b6bac9bd8bcdddcd1c9c7a