Android 2.3.4 release 1
Merge "Add missing property expected by XML repository." into tools_r7