Merge "Fix the linking error due to libminui change"
am: 5e9cc93aca

Change-Id: Ifd0239bc371a1a7ca1a67be62a9efc331ff4dfcb