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

* commit '4b3d08a785b919e1ab338d1f9f0573a4a44e14d0':
  Remove unwanted stdio symbols from android-17