Merge "Add media2 build target to prevent hidden API usage in MediaPlayer2"