Merge "Revert "add tinyhostless to Android.bp""