Android SDK ADT release 16.0.1
Merge "Sync main.confs with that of Bluez"