Merge "Remove projects being moved into from system/core into system/memory"
am: f7a6c4587f

Change-Id: If7bdb842cde2d4b0875fabd45927ed571a6153d2