Merge "Add method info to oat files" am: ed883a11b8 am: c1e311b14d
am: a427a626a6

Change-Id: I7a04344bd9be8963d3f8c650cfa39a6c2eb5fcda