Merge "Don't manually link stlport."
tree: 70bec9d59a58c630697687dd29a4495301cfdaa6
  1. bordeaux/
  2. Android.mk