Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db am: ae21f6f5b0
am: 195caa6696  -s ours

Change-Id: If30455d6043d7e63e48bf2773198bd80f2524937