am 5606c4d4: am e6dbddf5: Merge "Fix bug #11709153 CTS: android.view.cts.ViewTest#testPadding tests are failing in KLP-MR1" into klp-dev * commit '5606c4d4': Fix bug #11709153 CTS: android.view.cts.ViewTest#testPadding tests are failing in KLP-MR1