Merge "Fix some camera orientation javadoc errors." into gingerbread