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

Change-Id: I5b282d9082d677ee0b0842d3b329af680f6b0ae9