Merge "Update eclipse classpath to include MediaFrameworkTest"