Merge "Update layoulib following changes in Android source code"