Merge "libbufferhubqueue: sanitize logs and Android.bp"