Merge "Delete event dispatchers before close sl4a session. am: 7f2a74cf07 am: bb17b5abde" into oc-dev
am: 3ce9aae5ba

Change-Id: If30ccd3973aeed4050590a9332966962facccf12
tree: 913a213dec9a8840ccfca421247d8d9640ca6a93
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg