Merge "Blast: Use a unique id to track buffers" into sc-dev am: 848879ae am: 21ba48b5 am: 36b1c162

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15096591

Change-Id: I431ac849113df5d0080d3d33c3c8de7f996808dc