Merge "Add simple fake for native service manager." am: dc77bdf2ae am: bd7016a59c

Change-Id: I03dc370608fe1babfe112fcca4ef937b78d62fd3