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

* commit '8be1a88d20f9d9980075f67396781cb59660a36a':
  Update platform source.prop for new layoutlib. do not merge.