Merge "Make room for AVB hashtree and metadata."
am: 70209ad9f0

Change-Id: Ib9da55a7dd11d94f2044493ed932069de6c6eb74