Merge "Fix oatdump for app with --boot-image and add test."