am b3c3f938: resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp

* commit 'b3c3f9384f3ba864baac1ea7d0f7ed6e9c125ff2':
  ART: Relax CurrentMethodVisitor requirements on GetDexPC