Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566

Change-Id: I8391c77c52daaad70c1bcefab31970d6aa5d4b5c