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

Merge commit 'be57246603d3f6286dc6763a089daf5c1387de55' into gingerbread-plus-aosp

* commit 'be57246603d3f6286dc6763a089daf5c1387de55':
  Update prebuilt library test.