Merge "libxz: Android.mk -> Android.bp" am: 078994b97d am: 257279629b am: 0f97354095
am: 95e0e4c650

Change-Id: I54c8968efd494bf90f53caa5381c560dce9237a1