Merge "move native services under services/" into gingerbread