Merge "Another clarifying rename and a bit more automation." into dalvik-dev