Merge "Move private_manifest file insertion to jars merging phase."
am: 3d6aaa2f56

Change-Id: Idfa204e931e69b86e7f9845887edfa3b2abdf0d8