Merge "Add METADATA to smali: BSD+Apache2=NOTICE" am: 8bbb0bf857 am: 2da1720fb5

Change-Id: Ia1a588ba2cbd6d5c177f088e6f2a2880b96cd0ca