Merge "Simplify string transformation." into dalvik-dev