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

Change-Id: I8332681b1678fd13fc1eefc0b29b62808ee76f11