Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev