Remove dependency on support library. DO NOT MERGE.

Bug: 5689684
Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
1 file changed