Merge "Move the xz-java Android.bp to its new home..." am: 5ae067a57f
am: df2f14eb9b

Change-Id: I19592ecc3bbf0d56adadf64c0f8ed4c92cd77c5d