Merge "libxz: Android.mk -> Android.bp"