Merge "Fix the last warning and enable -Werror for external/flac." am: 445fd63a37
am: 9fbd371930

Change-Id: I791d1b6c949cb699488becfb6882f0fa45b9bcf4