am af7d2dda: am 5dc7a21c: Merge change I4e036287 into eclair

Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp

* commit 'af7d2dda809be2ce43b4b892509648857f09f5e3':
  update line test to expose some bug on SGX530 ed4