Merge "Fix a typo in FrameLayout JavaDoc"