Merge "Removing layout from frameworks/base"