Merge "Minor rename." into dalvik-dev