Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp * commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1': Change camera interface to support multiple cameras.