Merge "Fix oatdump for apps."