Fix red border problem (strict mode) in eng builds

Change-Id: If45cd5d3803d0e9cd92a63443199e2dbf3ad75ea
Dalvik tweak from Andromadus

Change-Id: I6b271a8161881d5eff6307ba0b7a0228d34d2880