Merge "Add method info to oat files"