am fe13c761: am be572466: Merge "Update prebuilt library test." into gingerbread

Merge commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e'

* commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e':
  Update prebuilt library test.