Fix monitor verification.

An earlier change inadvertently disabled the basic register type check
when the fancier checks were disabled.  This restores the type check,
and replaces a "TODO: add an assert" with an actual assert.

Bug 3246598.

(cherry-pick from dalvik-dev)

Change-Id: Iddfb33d2a3f0c03f5a06c3f6e4a47644ca640736
1 file changed