Revert "ANDROID: fixup dma_buf struct to avoid ABI breakage"

This reverts commit 62e2ce28.

Bug: 439084371
Bug: 435308937
Signed-off-by: T.J. Mercier <tjmercier@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:979ba2740d346f88d94c8a4a537b242e3c403e26)
Merged-In: I2aa86cc74a7394369cedff42cec42b5f0cd814a9
Change-Id: I2aa86cc74a7394369cedff42cec42b5f0cd814a9