Merge "Make entrypoints Thumb2." into dalvik-dev