Merge "Fix error for compiler update." into sc-dev-plus-aosp