Merge "adbconnection: libnativehelper include clean-up"