Merge "Build overlaytests as part of the normal build" am: ce2362fc7d am: 08d7ee4111
am: 58257c8891

Change-Id: I6ff4f390aa2e5084aab93a0a82bcdcdbebadb5f3