Merge "Removed unused jsonrpc.py" am: 2bcb51b23b
am: 7e471eea64

Change-Id: Id62dd88369abce8e14cabc3e2d3ba6600b044dde
tree: baaff7bbb1ae63799ef8fcbb36bb54e73686534b
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg