Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom