Merge "Fix max directionality in AndroidCharacter.getDirectionalities" am: db375f0a5a
am: f31549209e

Change-Id: Ic243a8ceb4519ea78e2d12fff4ee2e336ee83f97