Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibd5be536b10a8df19d365da267d2ad46b84dc14c
tree: e94f913ceb5f37480d0081538f40f5d94c6656ce
  1. core/
  2. services/
  3. wifi/