Use the correct package name for CHOOSER.

Bug: 13013106
Change-Id: I1f715de18e7108274f5a98234376d48c2d329438
Merge "Use the correct package name for CHOOSER." into kitkat