Merge "Fix push/pop instruction selection and encoding." into dalvik-dev