Merge "Convert hostsidetests/usb/**/Android.mk file to Android.bp (cherrypick)"
am: a01b2d52a6

Change-Id: I977ed2c8a52471f0e12249f49599ff4b71d6ebf2