Merge "Add METADATA to libogg: BSD+MIT=NOTICE" am: c3a96c2731

Change-Id: I2f55ad00b52fea801e1b2d6966dcfb205bdc410a