Add build.version.incremental to metadata am: d06f07eef4
am: 21c8d29ee1

Change-Id: I5da1e731e1d5694d8e9f3f2468ac8980ae8adfff