Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom