feature_set change from 'int' to 'long'

This commit makes some adjustments to accomodate the change of the
feature_set from being an int (32 bits) into becoming a long (64 bits)

Bug: 139354972
Test: Manual: Build succeeds
Change-Id: I665b57707fa5b22dd847023c02c92e8513c9caf6