Move the movies metrics constant back into O.

Test: None
Change-Id: I101c334973476af84ddfb76589c851fbb1f82426
1 file changed