Revert "default.xml:  Settings:  Use sm-mr1-staging branch for now"

This reverts commit acd22f91b905bf43b386e6f245150f0f033cc229.
Revert "default.xml:  switch frameworks/base to staging branch"

This reverts commit 472fa2f2441630f98ceada812d6be6ec077e36fb.