Merge "Remove unwanted stdio symbols from android-17"
am: 29caf3ae27

* commit '29caf3ae271c257823f6e16ee148209e17692a79':
  Remove unwanted stdio symbols from android-17