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

Change-Id: I308b4cd283b522f50d6c124de2f36b6f93457105