resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

Change-Id: If76931ca5a3046cdfebf9b4e9fcbe638691ca65b
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index dd9e184..c07cfeb 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -33,6 +33,7 @@
 # 397816 = JRO03B
 # 398337 = JRO03C
 # 405518 = JRO03H
+# 438695 = JRO03R
 # 463694 = JZO54G
 # end jb-dev
 BRANCH=jb-dev