Merge "Reverting SCCP change to division because the system doesn't start." into dalvik-dev