Android 4.0 CTS release 1
Merge "Sync main.confs with that of Bluez"