[Ajit|Praveen] Modified build to run on non-L devices.