Update default.xml
Revert "Update default.xml"

This reverts commit a53006cb3916bf6b476fdb943f011790248724ac.
Merge remote-tracking branch 'origin/kitkat' into gcc