Merge "Remove sysfs_gpu type definition" am: 096aafcee6 am: 4d8cc3534b

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1999650

Change-Id: I940e104fcc230ef6da8d0f25d42821853981eacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>