flo: Disable diag device in normal mode.

Remove the diag device when the device is in normal mode.

Bug: 18203257
Change-Id: I878ac648c49ef0940d55d5b6695bac24742847c8
merge in lmp-release history after reset to lmp-dev
merge in lmp-release history after reset to lmp-dev
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' of https://android.googlesource.com/device/asus/flo into HEAD

Android 5.0.1 release 1