Merge "Fix javac build" into oc-dev
tree: 5d9098e71c1b7c13c426c5a2e58f04d5b898bb7d
  1. service/
  2. PREUPLOAD.cfg