Merge "Move the xz-java Android.bp to its new home..."