Merge changes I5b15d41a,Ie7b9d653
am: 49a5c68

* commit '49a5c680906d4c0728279a1b8a161cb43cd263af':
  Remove precompiled version of libc/dl libraries
  Remove symlinks to android-3

Change-Id: Id3f266a573911d0cbcd15819a5903354b4e58b48