Merge "Remove services, wifi, ethernet from BOOTCLASSPATH." into lmp-dev