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

Change-Id: Id59c46831b4a3b33f979315d6a640a6852de8cd3