Android 6.0.1 release 17
Merge "Add NOTICE file"