Trying to clean up manifest for mer build. https://github.com/mer-hybris

Change-Id: I82913236813fe0703c875b417a262d5df22808fd