Merge "Update build numbers for LRX21O shamu"