Android 6.0.0 release 3
Merge "Add MODULE_LICENSE file"