Merge "Build libsimple_encode.a separately"