Throw a checked exception on inconsistent installs.

Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change b9048634.

bug: 21144503

(cherry picked from commit c52ae280)

Change-Id: I47b8762449714162fcd5c16eba6fcc146b93120b