Merge "Revert "Null check elimination improvement"" into dalvik-dev