Merge "Update build numbers for LRX21T"