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