Merge "Verify NumberMethodId in profile and dex_file."
am: 9d712939ec

Change-Id: I98f9959c0c6e27bc5cbe4848ed248cb6435668a4