Merge "Address comments left from aosp/2324894."
tree: 349655d37f13b972c8ae30d734395e00bf80d50f
  1. staticlibs/