Merge pull request #5390 from pAkalpa/master #3638

Job	Run time
libs-build	8m 7s
client-armv6-build	3m 46s
apps-build	12m 13s
client-arm-build	4m 13s
libs-cmake-build	9m 39s
client-arm64-build	3m 55s
client-x86-build	4m 40s
client-x86_64-build	3m 59s
manager-build (assembleRelease)	6m 45s
manager-build (assembleXiaomi_release)	5m 14s
manager-build (assembleArmv6_release)	5m 24s
manager-build (jacocoTestReportDebug)	10m 5s
	1h 18m 0s

Provide feedback