Merge "check build tests modules in eng and userdebug builds"