media: Modify 480p profile

720x480 resolution is not handled very well in camera apps,
making them look horribly stretched.

Remove VGA profile and use 640x480 resolution for 480p.
This is what stock does.

Change-Id: I4248960b58b5b4accc8d6c673ed1b9249a79e3cf

media/media_profiles.xml

@@ -106,22 +106,10 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="vga" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="2000000"
-                   width="640"
-                   height="480"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="128000"
-                   sampleRate="48000"
-                   channels="2" />
-        </EncoderProfile>
-
         <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
             <Video codec="h264"
                    bitRate="3449000"
-                   width="720"
+                   width="640"
                    height="480"
                    frameRate="30" />
             <Audio codec="aac"
@@ -180,23 +168,10 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="2000000"
-                   width="640"
-                   height="480"
-                   frameRate="30" />
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="128000"
-                   sampleRate="48000"
-                   channels="2" />
-        </EncoderProfile>
-
         <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
             <Video codec="h264"
                    bitRate="3449000"
-                   width="720"
+                   width="640"
                    height="480"
                    frameRate="30" />
             <!-- audio setting is ignored -->