Android CTS 5.0 release 6
Merge "Make sys_resource test more robust." into lollipop-cts-dev