Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp * commit 'af7d2dda809be2ce43b4b892509648857f09f5e3': update line test to expose some bug on SGX530 ed4
Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp * commit 'af7d2dda809be2ce43b4b892509648857f09f5e3': update line test to expose some bug on SGX530 ed4