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