Merge "Add support for Brillo partitioning."
am: 2528968

* commit '2528968871cb43a775b059a9300a7cd907c3cfce':
  Add support for Brillo partitioning.

Change-Id: I64897c61190f0674ec006d3ddf3af4342d9b8970