Bug 951565 - [b2g-bluetooth] Replace codeaurora bluedroid branch with b2...

...g one

I only modify base-jb.xml since only JB uses bluedroid.