Merge "Build java.obex with java_sdk_library" am: ad769993a9 am: efb4ce221e
am: 1d0038a843

Change-Id: Ie696bfe2d978f7078f1051e3320c183f69a65556