Merge "Remove duplicated classes with framework.jar from updatable-media.jar"