Merge "Update SL4A for LE CoC to test data performance" am: 9306b4a6e2
am: fe6e028a14

Change-Id: I6e55ed8a1e480c2ff6fefabbc62e248f12bbc6f6
tree: 8eba7237e3e9e1bd63f5a0e26b4fb888830243d1
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg