Merge "AOT inlined method lookup should stay within dex file." am: 5a87e19e4b
am: 07bc8348db

Change-Id: I8117c1d629dc1707d751d59824e62601ace75f43