Android 4.0.1 release 1.1
Merge "Sync main.confs with that of Bluez"