Merge "Package up proguard jack_dictionary"
am: f7d1a6d75f

Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6