Merge "Fix bug #6293659 android.view.cts.ViewGroupTest#testSetPadding fails - DO NOT MERGE" into jb-dev