Merge "audioflinger: increase client heap size to 4 MB"