Merge "Fix the linking error due to libminui change"