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

Change-Id: I72e14b6a334b3fa6227df57fc6c5f15d05e67570