Add metadata partition for non-system-as-root builds
am: ea006d856e

Change-Id: I7b103fc7ad2c60a7e98ad4fcd1bbc6f681066a65