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

Change-Id: Ieda1ba57b6655f0dc312f4f11ddd631ea97574b1