This reverts commit bdd4728a17. Reason for revert: original issue is fixed. Bug: 206902205 Test: adb work without the error of gadget hal. Change-Id: I3b7ab36f93e8bb7d6c23d53d4a12ed95d441fede
bdd4728a17