Merge "Be more prepared for InstrUtils code generation." into dalvik-dev