Merge "Remove AbsoluteLayout check for AttributeSet NPE" into jb-mr1-dev