Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo