Merge "Add build rule for assertj-core"
am: 985638d784

Change-Id: I7d842408588c3ca6c247974092816d17391f0a35