Fix WirelessADB Toggle & build

Change-Id: I4d53a372e525fead4e34cb4c1405a710e22f2543
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1