Merge "Fix three minor issues that prevent the phone from booting." into dalvik-dev