Merge changes I8ef4492b,I3c61421d

* changes:
  ART: Forward declarations for InvokeType
  ART: Move kDexNoIndex to dex_file_types.h