flo: increase vmalloc size by 100MB (240MB-->340MB)

b/18402205 External reports: Video playback failing on Flo after upgrade to
	   Lollipop
Change-Id: I8569a59f357a0bd689ed5a86da27fcf524a28143
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Remove flo BoardConfig.mk no-op.

Change-Id: Ibf51c91241b1bfcefbb48306ad9b7fbd3fd02602
Remove flo BoardConfig.mk cruft.

Change-Id: If44327fc3356a701cf60e7df8e68b7246922fbba
media: Enable ffmpeg decoders

Change-Id: I08b2824d5c7225536a788def68c9e24410295fa8
Replace libcyanogen-dsp in audio effects config.

Change-Id: I1b843110dce773c06f463ed7ebfc3b5d00c460e3
Merge remote-tracking branch 'cm/cm-12.0' into ose