Restored old patch, works fine with androidarmv6 repos

Change-Id: I844c929387aff93f4a4ec661ca93a1932063b31c