Simplifying constrain() and constrain_hbd()

Change-Id: Ie6677376861cb053a946724ba32a98a33d68e123
2 files changed