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

Change-Id: I2387e050306d8d409d3c09ce0132b4a1e0ef0611