also track build and android from DerTeufel

Change-Id: Iee4164701ac57ed0a35845b5f818266e6396f648