Android 6.0.1 release 12
Merge "Add MODULE_LICENSE file"