am b94ed50a: resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp

* commit 'b94ed50a53ecbfbd360a2771a22ec91283b9a5f3':
  Recycle mem-maps for collector transitions.