Merge "Build com.android.future.usb.accessory with java_sdk_library" am: 10cfc61774
am: 35d6bafc57

Change-Id: I205f0f1811b68aa41d105fbd8db24db52ae2d35e