to platform manifest. While I'm there also disconnect packages/apps/RetailDemo from build. Bug: 69925323 Change-Id: Ie664c0063f855dfc13ae8c69a84f614d095090eb