Merge "Move to modern utility methods from android::base."