am c87a0f01: Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread

* commit 'c87a0f0116780a644a2b8fb95fceeedd13434736':
  Fix Broken ContextWrapperTest#testAccessTheme