Add null check in AppendToBootClassPath am: 0a19e212e5
am: b4cda079a4

Change-Id: If6c9e38b72171a905a31e287f42aa1a5c8fc76bb