Merge "Simpleperf: Use defaults to pass static libs" am: 0c23dfee3b
am: e9db215be7

Change-Id: Ida5870f3c001c5ac797368bbb40766ba803ee1a7