Merge changes I67efa36e,I866e56ad
am: bd0338cdc2

* commit 'bd0338cdc254639cbc04f2c415d8c98704bc2028':
  Fix symbols ordering
  Remove unwanted stdio symbols from android-18 and 19