am d6b3f116: am 3ff3a549: am 1a3db4a5: Merge "Use LOCAL_CXX_STL instead of LOCAL_LDLIBS for proper dependencies."

* commit 'd6b3f116615a9b5a6c430360e6fb3f28c255db95':