Android 6.0.0 release 2
Merge "Add MODULE_LICENSE and NOTICE files"