Android o preview 3
Merge "libxz: Android.mk -> Android.bp"