Fix duplicate resource for Tentacles java

Change-Id: I5adc267af9e57498ae40dc9bab1c6c4a93009272
Fix else if statement for bluetooth

Change-Id: I930f7af02d6d13910ad6ae28fad18c00693ff5aa