Merge "Remove selinux/android.h from host tools" into mnc-dev