am baae30d9: am 7d85a6a5: Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"

* commit 'baae30d913b4048ff741310f835701369eccd3b2':
  system/core: Rename "chromeos" -> "brillo" in include paths and namespaces