Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo