Merge changes I1de10391,I4399ca26,Iec3b2b0b am: bff3c9b4c1 am: bae8872294

am: dbeab8de65

* commit 'dbeab8de6543db1d0393789cb18ee7fd7ed8fedd':
  Use libstdc++ for ijar
  Build ijar for apps build
  Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files

diff --cc core/base_rules.mk
Simple merge

diff --cc core/config.mk
Simple merge

diff --cc core/definitions.mk
Simple merge

diff --cc core/java.mk
Simple merge

diff --cc core/java_common.mk
Simple merge