Merge pull request #7174 from guycook:android-libcpp
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 2 Sep 2016 09:54:52 +0000 (09:54 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 2 Sep 2016 09:54:52 +0000 (09:54 +0000)

Trivial merge