Bump Android version
Revert hook approach; seems to cause connection issues
Bump Android version