Merge "Jarjar duplicate classes" into rvc-dev am: ffc478d673

Change-Id: I93abd649bc0c5e16042f4d23d0f2b357fc913a17
tree: 859e47f7f8546e3ae0c8514ae1668db6e3e7b428
  1. framework/
  2. OsuLogin/
  3. OWNERS