am 64d8f18c: Merge "Support inline dex data"

* commit '64d8f18c94b23cb4ff908304aef4d9f3f5a85f39':
  Support inline dex data