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

Change-Id: Ie4c50aa2447316edb1c02e1f65dcacf35c24d5f0