This reverts commit 61d87acb93. Failed upstream commit. The last attempt was 6 years ago! Suggested-by: Todd Kjos <tkjos@google.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Change-Id: Ieaa5234ab63fb14e69380239a6852fe0a04b5d84
61d87acb93
7ac177143c