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

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