Merge "Add METADATA to apache-harmony: Apache2=NOTICE" am: ae4ba55b4b

Change-Id: Iea6e599f58ad272be3d29290a5ca9107978944b5