Merge "Separating out configs and common manifest entries" into ub-launcher3-calgary
am: 72f9161b75

* commit '72f9161b75686ff3377387e14f437bae9c942f6a':
  Separating out configs and common manifest entries

Change-Id: I80d51641b6432c762bcb4f34efb3e27b96c0e168