Merge changes Id1896493,I05fe1099

* changes:
  Update MethodType.isConvertibleTo() for use on Android
  EmulatedStackFrame.{get,set}Reference fix