Merge "Remove NOTICE file; use global Android-Apache-2.0"