Disable strict mode on all kind of builds

That shitty red fucking borders are annoying me on -eng builds. I don't build -user always ;)
small fixes

Change-Id: I35a1af6098c2a9f636ce421d9de9ce1a3531f971
Merge commit '9ce87f2ed4f592c946573c33d2a0e0dcb8c6f73c' into jb-4.2