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