Merge "Update project.properties to use proper SDK 21 instead of preview L." into ub-camera-haleakala