Bug fixes for android mockup distribution