Merge "Update camera API and javadoc for API review comments." into gingerbread