Merge "replace NOTICE with a symlink to COPYING" am: e4e74127b8 am: 4e4cfdb239
am: 28d6f1f3a7

Change-Id: Icc3e918538f7d6ae0ece639f366bd9662455f604