am d76ff19a: Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev

* commit 'd76ff19a0f358d1b6473c33157c5ace2128d9623':
  Added local variable info output to javac command for host build.