Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210 am: 62bceaabe9
am: fd033a47e9

Change-Id: Ifab50666a6d71b3dfe18f06be5cb3137533998ee