Merge "Change crtbrand for host bionic"
am: 24f2676a39

Change-Id: I5bafed167058d162bd2ec63dff7bdb6aedfc3d1c