Merge "Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad2 am: 62bceaab am: fd033a47" into nyc-mr1-dev-plus-aosp