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

Change-Id: I11c3b75763f5bd5c8c4239d9a5135da7e18df03f