Merge "Handle renderscript apps in the system partition correctly." into lmp-dev