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

* commit '7e12aaa7748c44952d91b88c6f2863c16fe06deb':