Android n mr2 preview 1
Merge "Replace ADDITIONAL_DEFAULT_PROPERTIES"