Layoutlib updated
Merge branch 'jb-dev' of https://github.com/steppnasty/platform_frameworks_base into jb-dev
Layoutlib updated