Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44' * commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44': Minor fix for the parent style computation in the layoutlib.
Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44' * commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44': Minor fix for the parent style computation in the layoutlib.