Merge "Revert "QCamera3: Try to recover from failure during buffer cancellation"" into oc-dr1-dev am: 2a1a6c3501
am: 98664abfbd

Change-Id: If8353fb704755da64cdb2f209d3072f1459299d9
tree: 8405862bc39261e4fea7b6a94b7f168d8c4fc6c2
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk