Android 6.0.1 release 31
Merge "Add NOTICE and MODULE_LICENSE files"