Merge "Build fix." into dalvik-dev