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