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

This reverts commit 96d9ec43.

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