Merge "adbconnection: libnativehelper include clean-up"
am: 3c6589ba03

Change-Id: I32cf0f686aecb1cf4857968938afa2ec87802b90