Merge "Change all cf_common paths to cuttlefish paths"
am: 3b500a7ec3

Change-Id: Ifa8a0cb0fd1dc82f22966b158d82f363f3f3a0ac