Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp * commit '4055b780bb7e85abcf4754b84e50bf407c45bec8': move native services under services/
Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp * commit '4055b780bb7e85abcf4754b84e50bf407c45bec8': move native services under services/