am baa01faf: am 4f30a507: Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev

* commit 'baa01faf1d9c5baf9e431c359ba7fb104c9f2842':
  Fix handling of .o files in LOCAL_GENERATED_SOURCES.