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
Merge tag 'android-5.0.0_r7' of https://android.googlesource.com/device/asus/flo into hazypop

Android 5.0.0 release 7

# gpg: error loading `iconv.dll': Impossibile trovare il modulo specificato.
#
# gpg: please see http://www.gnupg.org/download/iconv.html for more information
# gpg: Signature made 11/19/14 00:13:07 using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found