Android CTS 5.0 Release 7 (2906672)
Merge "Make sys_resource test more robust." into lollipop-cts-dev