Merge "Clean up libjdwp.so and possibly other dependencies that might have crept in between http://r.android.com/890494 and http://r.android.com/913898."