Merge changes I1dd7d8e6,I0a745eb0 into oc-mr1-dev

* changes:
  QCamera3: Make sure stream IDs are unique
  QCamera3: Protect unregisterBuffer
tree: 49abb3b1f562b2309b648d922219eee550972510
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk