Merge "Fix typo bug in FrameLayout's measurement code. Bug #3327185" into honeycomb