am 60915b63: Merge commit \'4b076f42bdd1408937328c626f01c7c54301fa67\' into HEAD

* commit '60915b634faf786c82bd98773e1321ceb4254112':
am 804fcc53: Merge commit \'422a8f60f259b41f3909d1dfec9e0807454c9683\' into HEAD

* commit '804fcc53ee88e72c3bd079c81797ec624c839a6c':
am 2f60ea80: Merge "Make sure std::size_t is available before it is used"

* commit '2f60ea803f7214dc477392482d5726a5bf41583a':
  Make sure std::size_t is available before it is used
am 6f6b22e9: Merge "Fix 64 bit builds."

* commit '6f6b22e921d47ab5a6625199f609d2bbfb409061':
  Fix 64 bit builds.
Merge commit '05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be' into HEAD
am 01d98425: Merge changes Ib5e6736f,Ibf1b146d

* commit '01d98425a4d9b02e306a14a746541990df3d5743':
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings
am 474dac4d: Merge "stlport: if we can not throw, let us abort"

* commit '474dac4d0c5760d47dfb6ac52f6d9fc733fd2208':
  stlport: if we can not throw, let us abort
auto-merger: merge in from aosp/master