Revert back to AOSP android-5.0.0_r7
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Update default.xml
Merge remote-tracking branch 'upstream/lollipop' into lollipop

Conflicts:
	default.xml