Merge "Update build numbers for LMY47O N4, N7 (deb/flo)"