Merge "Fix support for @empty in style resolution" into oc-dev
am: 7d75f49175

Change-Id: Ie5a046f75a7c7fa13d330b90f3b9a8ff6c5ac373