Merge "Cleanup Bluetooth Java unit test makefile"