This reverts commit 5782f0d0cfc01b68c2c8855329e91d0c0dcc7df5. Reason for revert: Fixed the issue Test: The following CL does Change-Id: Ib31ec9c1ef03402636dffb592f66a2d0c01db179
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.