fix typo and libmerged build

Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858