Merge "Add METADATA to doclava: Apache2=NOTICE" am: 927d8aa74c

Change-Id: I357dbaa74e34003bacacfc04e3428fa7cb0d3ee5