Revert "Update build time icu path patching"

Patching Android packages is broken with this change.

This reverts commit f6d4b3f1a64928026604b0c796d49088a6533283

Change-Id: Ibd2c3332ba6601f9af11ea024d3a8a6bf2b2dc1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>