Merge pull request #7174 from guycook:android-libcpp