Merge "Improvements to sl4a." into lmp-dev