Some changes added to compile and run with Java 6 and Java 7.

  + [base/**/jni_generator.py]
      javap 5 and 6 don't show generics.
      This feature is added on javap 7 and higher.
      To retrieve the same behavior, javap (7 and higher) have a new option "-XDcompat".

Change-Id: I761064f14dcb38d52fd735ef462a2c08b8c12cab
Signed-off-by: Jerome Pilliet <pilliet@univ-mlv.fr>
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0