Merge "Fix ALOGE_IF log in bufferhubqueue" into oc-dr1-dev
am: c3e0cdb28a

Change-Id: I5ed228cd0f98a6324b799b506377df750238e549