Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d
am: 9d30592308

Change-Id: I2b4480c0d1a98ce4bb87d6fa30f347b929703fe9