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

Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf