Merge "Merge "Use new non-deprecated constructor for AppTarget.Builder" into...
Merge "Merge "Use new non-deprecated constructor for AppTarget.Builder" into qt-dev am: cb349b6b am: 438e12cd" into qt-r1-dev-plus-aosp
am: 2c3e15df
Change-Id: I3eae9dc825f4b9887af848986118c94beddb22ad