DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
am: aca26c9d45  -s ours

Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531