Merge "Move system manifest / device matrix build rules"
am: fe34c5b52c

Change-Id: If9873f37745d4f1ea4c567d9774c64b5e37a4dcd