Merge "Update build numbers for LRX21R"