Merge "check_ms_os_desc: fix buffer overflow." am: f7fed04ace

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1322275

Change-Id: I5bb717db05585f9c119b1b60f4a4f013da9e87a6