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

Change-Id: Id42b296c56192257a409a67136b66337ca150f40