update expand picture UT
Merge pull request #961 from ruil2/expand_update

    update expand picture UT
Merge remote-tracking branch 'upstream/master' into travis.android