Merge "Fix oatdump for app with --boot-image and add test." am: 8352ecdf20
am: f8b20e8905

Change-Id: I48e321291e1a16813b42974d6e779a0dba453090