Merge "Revert "Removing dragonboard from manifest"" into brillo-m7-dev