am 40ba6ec8: (-s ours) am 8be1a88d: am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.

* commit '40ba6ec8187186bf4586e94ea05b7574e2b27c45':
  Update platform source.prop for new layoutlib. do not merge.