This reverts commit 7d720f70. Reason for revert: Fixed the build issue Test: atest mediaroutertest Change-Id: I6cae922d701640a1f43965041c653bd7a61411cb