Merge "Dead code/cruft removal in the collation code." into dalvik-dev