Merge changes I5b15d41a,Ie7b9d653 am: 49a5c68
am: ffb4abd

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

Change-Id: I8386d59aaffe8f150897efabb27a0ffb9201c765