Merge "AOT inlined method lookup should stay within dex file." into pi-dev