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

Change-Id: I04a7829d1db825751ea77c76e79e53c9476e1a7f