Android 6.0.1 release 31
Merge "Add MODULE_LICENSE file"