Merge "Inline field and method resolution." into dalvik-dev