Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 595c421e47 [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 2b6e98954e
Former-commit-id: 0806be04dd