Android m preview
Merge "Whitelist device for stlport."