Merge "Remove @SystemApi from the fields of R.styleable (part 2)"