Merge \\\"Simpleperf: use libc++_static on host.\\\" am: 185f314239 am: b76a0affbd
am: 7982aa50d6

Change-Id: I21b3bd960573c03ecb688c1ce235852e1291d46b