A number of dependencies that got removed in r.android.com/129602 got accidentally readded in r.android.com/174547 in Android M merge to AOSP. This CL removes these unused dependencies again. Change-Id: I6639add51a7270b81a61743dc00d39b3169978ee