Merge changes from topic "framework-wifi-jarjar"

* changes:
  FrameworksWifiTests: build against framework-wifi (Attempt 2)
  Jarjar utils into framework-wifi and share with wifi-service
tree: 7029d99ee606ee3740e64ea4cef4083d249c6747
  1. apex/
  2. service/
  3. PREUPLOAD.cfg