Merge "Revert "Add GPU enabled ADPF to V5 of power hal."" into main