Merge "Fix wrong aspect ratio of camera preview." into gingerbread