Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread