Merge "Make metadata support through stagefright property dependent until it's ready."