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

Change-Id: I406c4e42181a72830e7f26f30376e4bd5e125e79