Merge "ART: Fix jvalue includes" am: fd3ffe0677
am: 7876ed0d50

Change-Id: Id63a695856322d71666587add4f209746111ba87