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

Change-Id: I9d6da22c618df56e5da08413ceb7eca6ce965a32