Merge changes from topic "ndk-prepare-surface"

* changes:
  Fix map key in PreparerThread pending streams.
  camera2 (v)ndk: Add APIs for pre-allocation of surface buffers.