Revert "Fix how 'current' branch is determined in updateBitsBranchPointers"

Apaches don't have MULTIVER_COMMON_HOME.

This reverts commit 5bd3cee78fee76555180a687f949aa7bcc3145b5.

Change-Id: Id1a2bb2c820c95f9bc97ea4e5578af1c79df9eea
Merge "Revert "Fix how 'current' branch is determined in updateBitsBranchPointers""