Merge "Add METADATA to mtpd: Apache2=NOTICE" am: c1d42e2bde am: e32bc00d9b am: 02856a9f67 am: 58fefd8f85

Change-Id: I3cfecbf3b2deb0708102248254e33e15b046079a