Add d2bst to barrier and if else its modem files

Change-Id: Ie64b94b71e8af6b17244e9aa15f9d6db384a7bf1
Merge "Add d2bst to barrier and if else its modem files" into lollipop