Merge "Update dalvik.bytecode package" am: 3f827b5e33
am: fd63280dd2

Change-Id: If0728a4f838a275860e32f078822554815e31f22