Merge "Improve camera face detection javadoc." into ics-mr1