Merge "This test is used to check if the kernel scheduler" am: 8039adad34 am: 0145ac08f0
am: 16126749c6  -s ours

Change-Id: I7f3e0795ca620616d3214249133e4257c7550af7