Merge "Adjust float-to-int brightness conversion to be purely in float." into rvc-dev am: 28e8a2c0ca am: 5c46e05058

Change-Id: If70f695dd7d42bd23ca70c6ebde2e4a98628c46f