Add bluetooth demo hacks.  Hope it doesn't break any gradle builds...