Merge "Add METADATA to dexmaker: Apache2+MIT=NOTICE" am: 19f7656569

Change-Id: I318e380783e805e7e4118bfd7238666cfc86aafc