use own build, add AOSP apps, normalize groups, reset other devices

Change-Id: I72d68f0d49cf77cf70574afb5f4eecdc54ea379e