Remove dependency on support library. DO NOT MERGE.

Bug: 5689684
Change-Id: I57c662da9b2c2009ee1631e637e5f55deea021b7
1 file changed