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

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