Merge "This test is used to check if the kernel scheduler" am: 8039adad am:...
Merge "This test is used to check if the kernel scheduler" am: 8039adad am: 0145ac08 am: 16126749 -s ours
am: 0c112d1a
Change-Id: I7c0d7138c014927f4a4760165f3aa89ce44e9f1e