Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Add proptools.FilterPropertyStruct
  Make CreateModule return the newly created module
  Add proptools.Int and proptools.IntDefault

Test: m checkbuild
Change-Id: I4bbd45be12794c1a8575799950772d4ecd272628