DO NOT MERGE) Revert "Fix support_library build due to MediaRouter"

This reverts commit 8b8f448825b1afb38bbf0b9863dfb014e3833b7b.

Change-Id: Ic780bc3b2470659bf672416bae0097bc42fc6ea5
1 file changed