Merge tag 'android-5.0.0_r6' of https://android.googlesource.com/device/asus/flo into HEAD

Flo: Testing inline kernel compilation

Change-Id: I98c00142b45584313b6479e64e8e967eeb7f0e93

flo: Disable diag device in normal mode.

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

Bug: 18203257

Change-Id: I878ac648c49ef0940d55d5b6695bac24742847c9