Merge tag 'android-5.0.2_r1' into merge_branch

Android 5.0.2 release 1

* tag 'android-5.0.2_r1':
  flo: increase vmalloc size by 100MB (240MB-->340MB)
  flo: Disable diag device in normal mode.

Change-Id: I94aefd438bd26fdf68e9eacdfe73eed43ef6ab70