Merge "Build against prebuilt support library resources in unbundled builds"...
Merge "Build against prebuilt support library resources in unbundled builds" into ub-contactsdialer-a-dev
am: 883843e2
* commit '883843e2':
Build against prebuilt support library resources in unbundled builds