am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE

* commit '327b11abdb95a185b0e39d48a9a315a615d962a1':