am 58251fe4: resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp

* commit '58251fe44d120b284bcdc47c3f28fbdfa6fb524d':
  Increasing arm(64)? emulator partition sizes to 1.5GB