Merge "Create build targets for a few libraries that are needed by room"
am: 8ef7bd266e

Change-Id: I01e5cc41bcfaecefdafcfc86b9e03c91686280bb