am e21f842a: am 44e42e61: am 67dc50cb: Merge changes Ie67acf11,Ia9c03558

* commit 'e21f842a0301c8cac3244d051f304f4682960bf1':
  Remove non-existanec functions/variables from libc.so
  Restore stdint.h for android-3..19 to the original headers