Merge "Put sl4a back into eng builds." into lmp-dev