This reverts commit 7d720f70be.
Reason for revert: Fixed the build issue
Test: atest mediaroutertest
Change-Id: I6cae922d701640a1f43965041c653bd7a61411cb
MediaFrameworkTest/
Uses instrumentation and so can be run with runtest.
It assumes /sdcard/media_api/ has been populated.
contents/media_api/
Push to /sdcard/media_api/ for use with MediaFrameworkTest:
adb shell mkdir /sdcard/media_api
adb push contents/media_api/ /sdcard/media_api/
All other subdirectories are manual tests or sample apps.