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

Change-Id: Id47a3227c34017b8b1658d19bad99543455456e1