am e848f6b2: Merge "Fix cts-content testdef." into eclair

Merge commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp

* commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
  Fix cts-content testdef.