am 2ca5c75b: am 443c9dc8: am c236e00e: am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"

* commit '2ca5c75ba130e0e0b508ed07b7bc74a3cc28038f':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources