Android 6.0.0 release 6
Merge "Add MODULE_LICENSE file"