reverse product build order to fix prop set order

Change-Id: Ic7ea602116ea45d83e687670d6e7bc3385fb7c9e
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2