Merge "Add make sync target"
am: 564ce0fa53

Change-Id: I88271ab1c71ce4c1fe9e7110bd8cf3861a4d28f6