Android 6.0.0 release 4
Merge "Add new generated file."