Android 6.0.0 release 2
Merge "Add NOTICE and MODULE_LICENSE files"