Merge "Add /sys/kernel/memory_state_time to sysfs_power." into pi-dev