Android l-preview release 2
Merge "Don't manually link stlport."