Merge "Add METADATA." am: 8c1499921e am: dda1bf761e

Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021

Change-Id: Ia8cf1d719cd785a18c584deffeab294fa3210e4c