fixes after merge

Change-Id: I33a57f46f293b5306d8b7c7c300bc41f9a031843
added ClockStock

Change-Id: Id4c653e9ed593768729c3b604d8d4b13cc616e93
fixed missing wifi in statusbar

Change-Id: Ie4dab2a0712f643f7fd7ccda61b3d49ebfc1b1e7
added optional adb enabled hack

Change-Id: I5d9e4aebc01b804c4d637acf0a37e29fdb8278a3