Merge "Add METADATA to dexmaker: Apache2+MIT=NOTICE" am: 19f7656569 am: 461fe84952 am: 43f9f9b5ad

Change-Id: Ia566939ba7bb74b3f7cab5189fdc433480d2c6c8