The issue with missing resources has been fixed. This reverts commit 9b0a74f0. Bug: 161214753 Change-Id: I863e76f199f7e209dfc86a85320f394c2285e71a Test: diff sdk artifacts before and after