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

Change-Id: Ib5459e77c919478fa684b85ba53e96b5718603e2