Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE" am: 64e7134a7c

Change-Id: I0940bea8f46eea079e313190480804b0f9163a21