Bluetooth: Workaround for aapt warnings

Change-Id: I42115573a9226aea9cbf4a668770fef852d2a2cc
Merge branch 'cm' into HEAD