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

Change-Id: I3a245c1064b28dddfcf113c26232af57f93458e7