Fix issue #220. Maintain RS compatibility with Android SDK 8.