am 698d0464: Merge "Whitelist device for stlport."

* commit '698d0464a52ee2610c4590ef313fe587deedb081':
  Whitelist device for stlport.