Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev