[nobug] Fix spurious incompatible execution environment and source Errors

Signed-off-by: Nitin Dahyabhai <thatnitind@gmail.com>
Change-Id: Ic92ed9c9dc33d79aff36d0f6dc0ab7e98131214a
27 files changed