Merge "Remove HOST_OUT_release" am: 2ab56bb480
am: 239c51fdbc

Change-Id: I152f1a09a49a1692986cbb4052d30868f42be5ac