Merge "Cleanup Bluetooth Java unit test makefile"
am: 46c5e4bd9a

Change-Id: I31e8e7580764d74d7e1af9927d7f88b9c74e0575