Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread