Merge changes I5b15d41a,Ie7b9d653

* changes:
  Remove precompiled version of libc/dl libraries
  Remove symlinks to android-3