Android 6.0.1 release 18
Merge "Add MODULE_LICENSE file"