Discard mode bits during upgradeDB check.

Also remove all references of mode because it's
no longer used.

b/17211164

Change-Id: Ifd63141a770a90926774ca635eac712f99b43da5
2 files changed